PMM-5086-12634 Agent model refactor. #3338
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit e72961b.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## v3 #3338 +/- ##
==========================================
+ Coverage 43.53% 45.28% +1.74%
==========================================
Files 366 193 -173
Lines 44169 28720 -15449
==========================================
- Hits 19230 13006 -6224
+ Misses 23254 14531 -8723
+ Partials 1685 1183 -502
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
1 task
JiriCtvrtka
commented
Dec 5, 2024
| now, now) | ||
| assertCheckViolation(t, err, "agents", "node_id_or_service_id_for_non_pmm_agent") | ||
| }) | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| func TestDatabaseMigrations(t *testing.T) { |
There was a problem hiding this comment.
Removed because to have this one working we need two encryption structures. So test is removed and we have only one encryption struct for V3.
var DefaultAgentEncryptionColumnsV3 = []encryption.Table{
{
Name: "agents",
Identifiers: []string{"agent_id"},
Columns: []encryption.Column{
{Name: "username"},
{Name: "password"},
{Name: "agent_password"},
{Name: "aws_options", CustomHandler: EncryptAWSOptionsHandler},
{Name: "azure_options", CustomHandler: EncryptAzureOptionsHandler},
{Name: "mongo_options", CustomHandler: EncryptMongoDBOptionsHandler},
{Name: "mysql_options", CustomHandler: EncryptMySQLOptionsHandler},
{Name: "postgresql_options", CustomHandler: EncryptPostgreSQLOptionsHandler},
},
},
}
// DefaultAgentEncryptionColumns contains all tables and it's columns to be encrypted in PMM Server DB.
var DefaultAgentEncryptionColumns = []encryption.Table{
{
Name: "agents",
Identifiers: []string{"agent_id"},
Columns: []encryption.Column{
{Name: "username"},
{Name: "password"},
{Name: "agent_password"},
{Name: "aws_access_key"},
{Name: "aws_secret_key"},
{Name: "azure_options", CustomHandler: EncryptAzureOptionsHandler},
{Name: "mongo_db_tls_options", CustomHandler: EncryptMongoDBOptionsHandler},
{Name: "mysql_options", CustomHandler: EncryptMySQLOptionsHandler},
{Name: "postgresql_options", CustomHandler: EncryptPostgreSQLOptionsHandler},
},
},
}
JiriCtvrtka
requested review from
BupycHuk,
idoqo and
ademidoff
and removed request for
a team
ademidoff
approved these changes
Dec 10, 2024
idoqo
approved these changes
Dec 16, 2024
| `UPDATE agents SET postgresql_options = '{}'::jsonb WHERE postgresql_options IS NULL`, | ||
|
|
||
| `UPDATE agents SET exporter_options = jsonb_set(exporter_options, '{expose_exporter}', to_jsonb(expose_exporter));`, | ||
| `UPDATE agents SET exporter_options = jsonb_set(exporter_options, '{push_metrics}', to_jsonb(push_metrics));`, |
There was a problem hiding this comment.
was wondering if we need a where push_metrics is not null here to avoid getting {"push_metrics": null}
There was a problem hiding this comment.
@idoqo I think no, because pushMetrics was bool on top of agent not *bool. So I think there should not be case with nil for push_metrics. But correct me if I am wrong.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PMM-5086
PMM-12634
FB: PMM-5086-12634 Agent model refactor. Percona-Lab/pmm-submodules#3792